From b46bbfc10cd9a1a4a2d14d660ae0354bf807a171 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 28 Apr 2006 14:35:34 +0100 Subject: [PATCH] Recent GUEST_HANDLE related cset broke ia64 compilation. Signed-off-by Kevin Tian --- linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h | 5 +++-- tools/libxc/xc_ia64_stubs.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h index 5f4e9107d8..e92cc4fbdb 100644 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h @@ -101,13 +101,14 @@ HYPERVISOR_poll( evtchn_port_t *ports, unsigned int nr_ports, u64 timeout) { struct sched_poll sched_poll = { - .ports = ports, .nr_ports = nr_ports, .timeout = jiffies_to_st(timeout) }; - int rc = HYPERVISOR_sched_op(SCHEDOP_poll, &sched_poll); + int rc; + set_xen_guest_handle(sched_poll.ports, ports); + rc = HYPERVISOR_sched_op(SCHEDOP_poll, &sched_poll); if (rc == -ENOSYS) rc = HYPERVISOR_sched_op_compat(SCHEDOP_yield, 0); diff --git a/tools/libxc/xc_ia64_stubs.c b/tools/libxc/xc_ia64_stubs.c index 15fcbb8122..a65dd5afb9 100644 --- a/tools/libxc/xc_ia64_stubs.c +++ b/tools/libxc/xc_ia64_stubs.c @@ -75,7 +75,7 @@ int xc_ia64_get_pfn_list(int xc_handle, op.cmd = DOM0_GETMEMLIST; op.u.getmemlist.domain = (domid_t)domid; op.u.getmemlist.max_pfns = max_pfns; - op.u.getmemlist.buffer = __pfn_buf; + set_xen_guest_handle(op.u.getmemlist.buffer, __pfn_buf); if ( (max_pfns != -1UL) && mlock(__pfn_buf, __nr_pages * sizeof(unsigned long)) != 0 ) @@ -729,7 +729,7 @@ int xc_hvm_build(int xc_handle, launch_op.u.setvcpucontext.domain = (domid_t)domid; launch_op.u.setvcpucontext.vcpu = 0; - launch_op.u.setvcpucontext.ctxt = ctxt; + set_xen_guest_handle(launch_op.u.setvcpucontext.ctxt, ctxt); launch_op.cmd = DOM0_SETVCPUCONTEXT; rc = do_dom0_op(xc_handle, &launch_op); -- 2.30.2